From fe5aed5bfe0e7ce543b20f8a271f3e1c005aff9f Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 10 Oct 2021 14:42:24 +0100 Subject: [PATCH] cppunit-optional Gbp-Pq: Name cppunit-optional.diff --- Repository.mk | 4 ++++ config_host.mk.in | 1 + configure.ac | Bin 515482 -> 515743 bytes sal/Module_sal.mk | 7 ++++++- sdext/Executable_pdf2xml.mk | 12 ++++++++++-- smoketest/Module_smoketest.mk | 4 ++++ test/Module_test.mk | 2 ++ testtools/Module_testtools.mk | 4 ++++ unotest/Module_unotest.mk | 2 ++ 9 files changed, 33 insertions(+), 3 deletions(-) diff --git a/Repository.mk b/Repository.mk index 61a136129f9..3c87bb0d52b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -802,8 +802,12 @@ endif # 'test_unittest' is only package delivering to workdir. # Other packages could be potentially autoinstalled. +ifeq ($(ENABLE_CPPUNIT),TRUE) $(eval $(call gb_Helper_register_packages, \ test_unittest \ +)) +endif +$(eval $(call gb_Helper_register_packages, \ cli_basetypes_copy \ extras_wordbook \ instsetoo_native_setup \ diff --git a/config_host.mk.in b/config_host.mk.in index df431c04453..efe5d54d10f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -147,6 +147,7 @@ export ENABLE_COINMP=@ENABLE_COINMP@ export SYSTEM_COINMP=@SYSTEM_COINMP@ export COINMP_CFLAGS=@COINMP_CFLAGS@ export COINMP_LIBS=@COINMP_LIBS@ +export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@ export ENABLE_CUPS=@ENABLE_CUPS@ export ENABLE_CURL=@ENABLE_CURL@ export ENABLE_FUZZERS=@ENABLE_FUZZERS@ diff --git a/configure.ac b/configure.ac index 05df0719339ef6f635adc24c77c91b0f948c7908..a69d30b6a8e4d65893310d5863106fb92025843c 100644 GIT binary patch delta 255 zcmbQWTYmmt`Gzfwv60Nl1qIXNA{iB?2S_rqqyc%Qd6^}4u{vA|P!OGxS)7=Zld6zZ znwgW5nU}7isHu>jrT|r{P+U@)mZp%HQ=AW0QKFDiS_D+3keiqd)f20!!=+Q6S&|VC z)ib%_vFP*-F^sJ3v5|~G%ml>D+hZeH9G8k^rYV%97MCa}sUYi^Ubu=yWcv4+tWwi= z{bSLP0J+W8&(X=pHQqTOAk@z@#5N=-)Rk-c!wF0h>`0jCy1Ew43GxN2& OvbMUiZFOajx(5K8I~8XD diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 1a190037f05..1a65e9bf7f9 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,sal)) $(eval $(call gb_Module_add_targets,sal,\ - $(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ @@ -37,4 +36,10 @@ $(eval $(call gb_Module_add_check_targets,sal,\ endif +ifeq ($(ENABLE_CPPUNIT),TRUE) +$(eval $(call gb_Module_add_check_targets,sal,\ + $(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk index b2439164a1e..2f919d0da27 100644 --- a/sdext/Executable_pdf2xml.mk +++ b/sdext/Executable_pdf2xml.mk @@ -13,10 +13,10 @@ $(eval $(call gb_Executable_use_sdk_api,pdf2xml)) $(eval $(call gb_Executable_use_externals,pdf2xml,\ boost_headers \ - cppunit \ zlib \ )) + $(eval $(call gb_Executable_set_include,pdf2xml,\ -I$(SRCDIR)/sdext/source/pdfimport/inc \ $$(INCLUDE) \ @@ -27,13 +27,21 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\ vcl \ comphelper \ cppu \ - unotest \ cppuhelper \ sal \ tl \ xo \ )) +ifeq ($(ENABLE_CPPUNIT),TRUE) +$(eval $(call gb_Executable_use_externals,pdf2xml,\ + cppunit \ +)) +$(eval $(call gb_Executable_use_libraries,pdf2xml,\ + unotest \ +)) +endif + $(eval $(call gb_Executable_use_library_objects,pdf2xml,pdfimport)) $(eval $(call gb_Executable_add_exception_objects,pdf2xml,\ diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk index 217dbfa6543..c2de731a9e5 100644 --- a/smoketest/Module_smoketest.mk +++ b/smoketest/Module_smoketest.mk @@ -12,6 +12,8 @@ $(eval $(call gb_Module_Module,smoketest)) ifeq ($(CROSS_COMPILING),) +ifeq ($(ENABLE_CPPUNIT),TRUE) + $(eval $(call gb_Module_add_targets,smoketest,\ Library_smoketest \ Zip_smoketestdoc \ @@ -36,6 +38,8 @@ endif endif +endif + ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,smoketest,\ Jar_smoketest \ diff --git a/test/Module_test.mk b/test/Module_test.mk index 080cc855b28..8d47bbc6463 100644 --- a/test/Module_test.mk +++ b/test/Module_test.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,test)) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifeq ($(ENABLE_CPPUNIT),TRUE) $(eval $(call gb_Module_add_targets,test,\ Library_test \ Library_test_setupvcl \ @@ -22,6 +23,7 @@ $(eval $(call gb_Module_add_targets,test,\ $(eval $(call gb_Module_add_check_targets,test,\ CppunitTest_test_xpath \ )) +endif endif diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk index a1b84e175b3..08e4aad24c1 100644 --- a/testtools/Module_testtools.mk +++ b/testtools/Module_testtools.mk @@ -11,6 +11,8 @@ $(eval $(call gb_Module_Module,testtools)) ifeq ($(CROSS_COMPILING),) +ifeq ($(ENABLE_CPPUNIT),TRUE) + $(eval $(call gb_Module_add_targets,testtools,\ CustomTarget_bridgetest \ InternalUnoApi_bridgetest \ @@ -41,4 +43,6 @@ $(eval $(call gb_Module_add_check_targets,testtools,\ endif +endif + # vim:set noet sw=4 ts=4: diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk index bdffe8e8ac1..acdd4da6c53 100644 --- a/unotest/Module_unotest.mk +++ b/unotest/Module_unotest.mk @@ -12,12 +12,14 @@ $(eval $(call gb_Module_Module,unotest)) ifeq ($(gb_Side),host) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifeq ($(ENABLE_CPPUNIT),TRUE) $(eval $(call gb_Module_add_targets,unotest,\ Library_unobootstrapprotector \ Library_unoexceptionprotector \ Library_unotest \ )) endif +endif ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,unotest,\ -- 2.30.2